From a57110497377c31f904a0dc23c38a3c821e971cc Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 13 Feb 2021 23:33:30 +0000 Subject: [PATCH] d/rules: Tolerate minor differences in some reftests --- debian/close-enough.keyfile | 5 +++++ debian/rules | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 debian/close-enough.keyfile diff --git a/debian/close-enough.keyfile b/debian/close-enough.keyfile new file mode 100644 index 0000000000..f3a214beae --- /dev/null +++ b/debian/close-enough.keyfile @@ -0,0 +1,5 @@ +[reftest] +accepted-diff-level=1 +accepted-diff-pixels=50 +tolerated-diff-level=10 +tolerated-diff-pixels=100 diff --git a/debian/rules b/debian/rules index f93bc39bb0..9ebe81891f 100755 --- a/debian/rules +++ b/debian/rules @@ -194,6 +194,14 @@ $(info Architecture with qemu buildds detected, increasing test timeout a lot) test_timeout_multiplier = 20 endif +fuzzy_reftests = \ + border-image-url \ + label-attribute-preference \ + label-wrap-justify \ + pseudoclass-on-box \ + quit-mnemonic \ + $(NULL) + # TODO: Known failures: # amd64: none # arm64: none @@ -218,6 +226,10 @@ endif override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) rm -f debian/tests-failed + set -e; for reftest in $(fuzzy_reftests); do \ + cp debian/close-enough.keyfile \ + testsuite/reftests/$$reftest.keyfile; \ + done # Mark reftests with known failures as non-fatal #touch testsuite/reftests/nonresizable-size.ui.known_fail #touch testsuite/reftests/window-show-contents-on-map.ui.known_fail @@ -250,6 +262,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) || touch debian/tests-failed tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt debian/log-reftests.py + set -e; for reftest in $(fuzzy_reftests); do \ + rm -f testsuite/reftests/$$reftest.keyfile; \ + done if test -e debian/tests-failed; then exit 1; fi endif -- 2.30.2